From 05c3079db687667243d46946e916f7bb50a169c8 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 16 Sep 2014 18:49:18 -0700 Subject: [PATCH] Add an option to bootstrap from a local cargo --- Makefile.in | 6 +++++- configure | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index a94db80d2..359f09a08 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,7 +58,11 @@ BIN_TARGETS_$(1) := $$(BIN_TARGETS:%=$$(TARGET_$(1))/%$$(X)) endef $(foreach target,$(CFG_TARGET),$(eval $(call DIST_TARGET,$(target)))) +ifdef CFG_LOCAL_CARGO +CARGO := $(CFG_LOCAL_CARGO) +else CARGO := $(TARGET_ROOT)/snapshot/bin/cargo$(X) +endif all: $(foreach target,$(CFG_TARGET),cargo-$(target)) @@ -72,7 +76,7 @@ test-unit-$(1): $$(CARGO) endef $(foreach target,$(CFG_TARGET),$(eval $(call CARGO_TARGET,$(target)))) -$(CARGO): src/snapshots.txt +$(TARGET_ROOT)/snapshot/bin/cargo$(X): src/snapshots.txt $(CFG_PYTHON) src/etc/dl-snapshot.py $(CFG_BUILD) touch $@ diff --git a/configure b/configure index e1da3a7f5..255b51bfc 100755 --- a/configure +++ b/configure @@ -326,6 +326,7 @@ valopt datadir "${CFG_PREFIX}/share" "install data" valopt infodir "${CFG_PREFIX}/share/info" "install additional info" valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH" valopt libdir "${CFG_PREFIX}/lib" "install libraries" +valopt local-cargo "" "local cargo to bootstrap from" if [ $HELP -eq 1 ] then -- 2.30.2